From 02c2dde27d71d9f5c8284b455d9826b9c1294f11 Mon Sep 17 00:00:00 2001
From: James Lopez <james@gitlab.com>
Date: Fri, 13 Jul 2018 07:35:31 +0000
Subject: [PATCH 1/2] Bump Git to 2.18

---
 .gitlab-ci.yml | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18e360d..8b635cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,23 +57,27 @@ ruby-2.3-golang-1.9-git-2.9 test: *test_custom
 ruby-2.3-golang-1.9-git-2.14 test: *test_custom
 ruby-2.3-golang-1.9-git-2.16 test: *test_custom
 ruby-2.3-golang-1.9-git-2.17 test: *test_custom
+ruby-2.3-golang-1.9-git-2.18 test: *test_custom
 ruby-2.3-golang-1.10-git-2.9 test: *test_custom
 ruby-2.3-golang-1.10-git-2.14 test: *test_custom
 ruby-2.3-golang-1.10-git-2.16 test: *test_custom
 ruby-2.3-golang-1.10-git-2.17 test: *test_custom
+ruby-2.3-golang-1.10-git-2.18 test: *test_custom
 ruby-2.4-golang-1.9-git-2.9 test: *test_custom
 ruby-2.4-golang-1.9-git-2.14 test: *test_custom
 ruby-2.4-golang-1.9-git-2.16 test: *test_custom
 ruby-2.4-golang-1.9-git-2.17 test: *test_custom
+ruby-2.4-golang-1.9-git-2.18 test: *test_custom
 ruby-2.4-golang-1.10-git-2.14 test: *test_custom
 ruby-2.4-golang-1.10-git-2.16 test: *test_custom
 ruby-2.4-golang-1.10-git-2.17 test: *test_custom
+ruby-2.4-golang-1.10-git-2.18 test: *test_custom
 
 # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
-ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
-ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
-ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
-ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
+ruby-2.4.4-golang-1.9-git-2.18-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
+ruby-2.4.4-golang-1.9-git-2.18-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
+ruby-2.4.4-golang-1.9-git-2.18-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
+ruby-2.4.4-golang-1.9-git-2.18-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom
 
 # Not used anymore (?)
 golang-1.9-git-2.9.0 test: *test_custom
@@ -112,23 +116,27 @@ ruby-2.3-golang-1.9-git-2.9: *build_and_deploy_custom
 ruby-2.3-golang-1.9-git-2.14: *build_and_deploy_custom
 ruby-2.3-golang-1.9-git-2.16: *build_and_deploy_custom
 ruby-2.3-golang-1.9-git-2.17: *build_and_deploy_custom
+ruby-2.3-golang-1.9-git-2.18: *build_and_deploy_custom
 ruby-2.3-golang-1.10-git-2.9: *build_and_deploy_custom
 ruby-2.3-golang-1.10-git-2.14: *build_and_deploy_custom
 ruby-2.3-golang-1.10-git-2.16: *build_and_deploy_custom
 ruby-2.3-golang-1.10-git-2.17: *build_and_deploy_custom
+ruby-2.3-golang-1.10-git-2.18: *build_and_deploy_custom
 ruby-2.4-golang-1.9-git-2.9: *build_and_deploy_custom
 ruby-2.4-golang-1.9-git-2.14: *build_and_deploy_custom
 ruby-2.4-golang-1.9-git-2.16: *build_and_deploy_custom
 ruby-2.4-golang-1.9-git-2.17: *build_and_deploy_custom
+ruby-2.4-golang-1.9-git-2.18: *build_and_deploy_custom
 ruby-2.4-golang-1.10-git-2.14: *build_and_deploy_custom
 ruby-2.4-golang-1.10-git-2.16: *build_and_deploy_custom
 ruby-2.4-golang-1.10-git-2.17: *build_and_deploy_custom
+ruby-2.4-golang-1.10-git-2.18: *build_and_deploy_custom
 
 # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
-ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
-ruby-2.4.4-golang-1.9-git-2.17-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
-ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
-ruby-2.4.4-golang-1.9-git-2.17-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
+ruby-2.4.4-golang-1.9-git-2.18-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
+ruby-2.4.4-golang-1.9-git-2.18-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
+ruby-2.4.4-golang-1.9-git-2.18-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom
+ruby-2.4.4-golang-1.9-git-2.18-chrome-67.0-node-8.x-yarn-1.2-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom
 
 # Used by https://gitlab.com/gitlab-org/trello-power-up/blob/master/.gitlab-ci.yml (?)
 node-8.9-chrome-63.0-yarn-1.2: *build_and_deploy_custom

From 8e705228d9485a10977c8510391d7c48a6ab8ee6 Mon Sep 17 00:00:00 2001
From: James Lopez <james@gitlab.com>
Date: Fri, 13 Jul 2018 07:51:54 +0000
Subject: [PATCH 2/2] Update scripts/custom-docker-build

---
 scripts/custom-docker-build | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index f70efcb..296c272 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -99,6 +99,10 @@ function print_git_args() {
             GIT_VERSION=2.17.1
             GIT_DOWNLOAD_SHA256=ec6452f0c8d5c1f3bcceabd7070b8a8a5eea11d4e2a04955c139b5065fd7d09a
             ;;
+        2.18)
+            GIT_VERSION=2.18.0
+            GIT_DOWNLOAD_SHA256=94faf2c0b02a7920b0b46f4961d8e9cad08e81418614102898a55f980fa3e7e4
+            ;;            
         *) echo "Unknown git version $1"; exit 1;
     esac