From 58335985826a14731115a1ca36252e15c8837d2a Mon Sep 17 00:00:00 2001
From: diroots <diroots@no-log.org>
Date: Tue, 2 Feb 2021 16:53:14 +0100
Subject: [PATCH 1/4] contact-search top right icon removal first try.

---
 Dockerfile                               |  1 +
 patches/003-contact-search-removal.patch | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 patches/003-contact-search-removal.patch

diff --git a/Dockerfile b/Dockerfile
index acbfb966..050635e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,3 +2,4 @@ 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 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
\ No newline at end of file
diff --git a/patches/003-contact-search-removal.patch b/patches/003-contact-search-removal.patch
new file mode 100644
index 00000000..a7b28400
--- /dev/null
+++ b/patches/003-contact-search-removal.patch
@@ -0,0 +1,17 @@
+--- 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'));?>"
-- 
GitLab


From d3e2a2045ed921e8283adeef57be8692ea5aa9f5 Mon Sep 17 00:00:00 2001
From: diroots <diroots@no-log.org>
Date: Wed, 3 Feb 2021 16:22:40 +0100
Subject: [PATCH 2/4] version bump to force file sync

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 050635e7..23944c9c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
 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,2/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
\ No newline at end of file
-- 
GitLab


From 751f9ba4d47f5511b8f67fb60014893b00f38a9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnau=20V=C3=A0zquez=20Palma?= <arnauvp@e.email>
Date: Thu, 4 Feb 2021 10:35:17 +0100
Subject: [PATCH 3/4] Remove also API functionality for contact search.

---
 Dockerfile                                    |  5 ++--
 ...04-contact-search-controller-removal.patch | 23 +++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 patches/004-contact-search-controller-removal.patch

diff --git a/Dockerfile b/Dockerfile
index 23944c9c..bd4ed9ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 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,2/g' /usr/src/nextcloud/version.php
+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
\ No newline at end of file
+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
diff --git a/patches/004-contact-search-controller-removal.patch b/patches/004-contact-search-controller-removal.patch
new file mode 100644
index 00000000..0ada4312
--- /dev/null
+++ b/patches/004-contact-search-controller-removal.patch
@@ -0,0 +1,23 @@
+--- 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);
+ 	}
+ }
-- 
GitLab


From 5117e2356f8ceb332d2f3f90c155535d44807f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arnau=20V=C3=A0zquez=20Palma?= <arnauvp@e.email>
Date: Thu, 4 Feb 2021 10:38:41 +0100
Subject: [PATCH 4/4] Fix tag names using dual job definition.

---
 .gitlab-ci.yml | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6546d51a..81455d0b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,18 +1,30 @@
-docker-build:
-  image: docker:stable
+# When using dind, it's wise to use the overlayfs driver for
+# improved performance.
+variables:
+  DOCKER_DRIVER: overlay2
 
-  # 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 
+    - 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"
\ No newline at end of file
+    - 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"
-- 
GitLab