From 58002f9dd32ab4d431df18c1e80cac0885135a5e Mon Sep 17 00:00:00 2001
From: DJ Mountney <dj@gitlab.com>
Date: Sun, 22 Nov 2020 07:54:49 -0800
Subject: [PATCH] Update GitLab to the 13.6.0 Minor Release

---
 Dockerfile                 | 4 ++--
 Jenkinsfile                | 2 +-
 build-scripts/build.sh     | 2 +-
 download.yaml              | 4 ++--
 scripts/rails-dependencies | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 746164b..be6974f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,8 @@
-ARG GITLAB_VERSION=v13.5.4-ubi8
+ARG GITLAB_VERSION=v13.6.0-ubi8
 
 ARG BASE_REGISTRY=nexus-docker-secure.levelup-nexus.svc.cluster.local:18082
 ARG BASE_IMAGE=gitlab/gitlab/gitlab-ruby
-ARG BASE_TAG=13.5.4
+ARG BASE_TAG=13.6.0
 
 ARG RUBY_IMAGE=${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 11e5b24..8fe2522 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,2 +1,2 @@
 @Library('DCCSCR@master') _
-dccscrPipeline(version: "13.5.4")
+dccscrPipeline(version: "13.6.0")
diff --git a/build-scripts/build.sh b/build-scripts/build.sh
index a9dd936..1eb99be 100755
--- a/build-scripts/build.sh
+++ b/build-scripts/build.sh
@@ -4,7 +4,7 @@
 
 set -euxo pipefail
 
-TAG=${1:-13.5.4}
+TAG=${1:-13.6.0}
 REPOSITORY=${2:-}
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
diff --git a/download.yaml b/download.yaml
index b329d3c..73c6ea1 100644
--- a/download.yaml
+++ b/download.yaml
@@ -1,6 +1,6 @@
 resources:
-  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.5.4-ubi8/gitlab-rails-ee.tar.gz"
+  - url: "http://gitlab-ubi.s3.amazonaws.com/ubi8-build-dependencies-v13.6.0-ubi8/gitlab-rails-ee.tar.gz"
     filename: "gitlab-rails-ee.tar.gz"
     validation:
       type: "sha256"
-      value: "66475e30148118d030f8e9eff9b216a57580f1e62fa9f0c340b0eb8248573dd5"
+      value: "72c8c470ede2fbd6de0215b5e3c0e96736a11239f8e0debe55c9bc3058206747"
diff --git a/scripts/rails-dependencies b/scripts/rails-dependencies
index d092e15..c0d5165 100755
--- a/scripts/rails-dependencies
+++ b/scripts/rails-dependencies
@@ -24,7 +24,7 @@ end
 [database_thread, redis_thread].map(&:join)
 
 if redis_thread.value && database_thread.value
-  Bundler.clean_exec ARGV.join(' ') unless ARGV.empty?
+  Bundler.original_exec ARGV.join(' ') unless ARGV.empty?
 else
   puts 'WARNING: Not all services were operational, with data migrations completed.'
 
-- 
GitLab