Loading .gitlab-ci.yml +21 −9 Original line number Diff line number Diff line docker-build: image: docker:stable # When using dind, it's wise to use the overlayfs driver for # improved performance. variables: DOCKER_DRIVER: overlay2 default: image: docker:stable services: - docker:dind before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY stage: build tags: - generic_privileged build-branch: except: - tags stage: build script: - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" build-tag: only: - tags stage: build script: - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" . - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" Dockerfile +3 −0 Original line number Diff line number Diff line FROM nextcloud:19.0.7-fpm RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images COPY patches/ /tmp/build_patches/ RUN sed -i 's/19,0,7,1/19,0,7,3/g' /usr/src/nextcloud/version.php RUN patch -u /usr/src/nextcloud/core/Controller/LoginController.php -i /tmp/build_patches/002-login-without-domain.patch RUN patch -u /usr/src/nextcloud/core/templates/layout.user.php -i /tmp/build_patches/003-contact-search-removal.patch RUN patch -u /usr/src/nextcloud/core/Controller/ContactsMenuController.php -i /tmp/build_patches/004-contact-search-controller-removal.patch No newline at end of file patches/003-contact-search-removal.patch 0 → 100644 +17 −0 Original line number Diff line number Diff line --- layout.user.php 2021-02-02 16:47:17.348572250 +0100 +++ layout.user.php-new 2021-02-02 16:47:33.128646878 +0100 @@ -111,14 +111,6 @@ autocomplete="off"> <button class="icon-close-white" type="reset"><span class="hidden-visually"><?php p($l->t('Reset search'));?></span></button> </form> - <div id="contactsmenu"> - <div class="icon-contacts menutoggle" tabindex="0" role="button" - aria-haspopup="true" aria-controls="contactsmenu-menu" aria-expanded="false"> - <span class="hidden-visually"><?php p($l->t('Contacts'));?></span> - </div> - <div id="contactsmenu-menu" class="menu" - aria-label="<?php p($l->t('Contacts menu'));?>"></div> - </div> <div id="settings"> <div id="expand" tabindex="0" role="button" class="menutoggle" aria-label="<?php p($l->t('Settings'));?>" patches/004-contact-search-controller-removal.patch 0 → 100644 +23 −0 Original line number Diff line number Diff line --- ContactsMenuController.php 2021-02-04 10:20:18.000000000 +0100 +++ ContactsMenuController-new.php 2021-02-04 10:30:13.000000000 +0100 @@ -58,7 +58,7 @@ * @return \JsonSerializable[] */ public function index($filter = null) { - return $this->manager->getEntries($this->userSession->getUser(), $filter); + return []; } /** @@ -69,11 +69,6 @@ * @return JSONResponse|\JsonSerializable */ public function findOne($shareType, $shareWith) { - $contact = $this->manager->findOne($this->userSession->getUser(), $shareType, $shareWith); - - if ($contact) { - return $contact; - } return new JSONResponse([], Http::STATUS_NOT_FOUND); } } Loading
.gitlab-ci.yml +21 −9 Original line number Diff line number Diff line docker-build: image: docker:stable # When using dind, it's wise to use the overlayfs driver for # improved performance. variables: DOCKER_DRIVER: overlay2 default: image: docker:stable services: - docker:dind before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY stage: build tags: - generic_privileged build-branch: except: - tags stage: build script: - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" build-tag: only: - tags stage: build script: - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" . - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
Dockerfile +3 −0 Original line number Diff line number Diff line FROM nextcloud:19.0.7-fpm RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images COPY patches/ /tmp/build_patches/ RUN sed -i 's/19,0,7,1/19,0,7,3/g' /usr/src/nextcloud/version.php RUN patch -u /usr/src/nextcloud/core/Controller/LoginController.php -i /tmp/build_patches/002-login-without-domain.patch RUN patch -u /usr/src/nextcloud/core/templates/layout.user.php -i /tmp/build_patches/003-contact-search-removal.patch RUN patch -u /usr/src/nextcloud/core/Controller/ContactsMenuController.php -i /tmp/build_patches/004-contact-search-controller-removal.patch No newline at end of file
patches/003-contact-search-removal.patch 0 → 100644 +17 −0 Original line number Diff line number Diff line --- layout.user.php 2021-02-02 16:47:17.348572250 +0100 +++ layout.user.php-new 2021-02-02 16:47:33.128646878 +0100 @@ -111,14 +111,6 @@ autocomplete="off"> <button class="icon-close-white" type="reset"><span class="hidden-visually"><?php p($l->t('Reset search'));?></span></button> </form> - <div id="contactsmenu"> - <div class="icon-contacts menutoggle" tabindex="0" role="button" - aria-haspopup="true" aria-controls="contactsmenu-menu" aria-expanded="false"> - <span class="hidden-visually"><?php p($l->t('Contacts'));?></span> - </div> - <div id="contactsmenu-menu" class="menu" - aria-label="<?php p($l->t('Contacts menu'));?>"></div> - </div> <div id="settings"> <div id="expand" tabindex="0" role="button" class="menutoggle" aria-label="<?php p($l->t('Settings'));?>"
patches/004-contact-search-controller-removal.patch 0 → 100644 +23 −0 Original line number Diff line number Diff line --- ContactsMenuController.php 2021-02-04 10:20:18.000000000 +0100 +++ ContactsMenuController-new.php 2021-02-04 10:30:13.000000000 +0100 @@ -58,7 +58,7 @@ * @return \JsonSerializable[] */ public function index($filter = null) { - return $this->manager->getEntries($this->userSession->getUser(), $filter); + return []; } /** @@ -69,11 +69,6 @@ * @return JSONResponse|\JsonSerializable */ public function findOne($shareType, $shareWith) { - $contact = $this->manager->findOne($this->userSession->getUser(), $shareType, $shareWith); - - if ($contact) { - return $contact; - } return new JSONResponse([], Http::STATUS_NOT_FOUND); } }